Check for a stock icon, not a stock item, when deciding whether to use

2006-03-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkactiongroup.c (gtk_action_group_add_actions_full)
	(gtk_action_group_add_toggle_actions_full)
	(gtk_action_group_add_radio_actions_full): Check for a stock
	icon, not a stock item, when deciding whether to use stock-id
	or icon-name.  (#334760, Jody Goldberg)

diff --git a/ChangeLog b/ChangeLog
index 268335059180831b7d0dd418acc0d193ca708e0d..6df12e07d328ed79a36d89f326b716f12a15d19b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-03-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full) 
+       (gtk_action_group_add_toggle_actions_full) 
+       (gtk_action_group_add_radio_actions_full): Check for a stock 
+       icon, not a stock item, when deciding whether to use stock-id 
+       or icon-name.  (#334760, Jody Goldberg)
+
        * gtk/gtkimage.c (gtk_image_clear): Update the size of the image, 
        by swapping the implementations of gtk_image_clear and
        gtk_image_reset.  (#334657)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 268335059180831b7d0dd418acc0d193ca708e0d..6df12e07d328ed79a36d89f326b716f12a15d19b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2006-03-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_actions_full) 
+       (gtk_action_group_add_toggle_actions_full) 
+       (gtk_action_group_add_radio_actions_full): Check for a stock 
+       icon, not a stock item, when deciding whether to use stock-id 
+       or icon-name.  (#334760, Jody Goldberg)
+
        * gtk/gtkimage.c (gtk_image_clear): Update the size of the image, 
        by swapping the implementations of gtk_image_clear and
        gtk_image_reset.  (#334657)

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index a6a40446c7fb762d08aa1e782832ebb67015b19d..aa5adb5d779b4df126ee51603475ec71f82f86b5 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -781,9 +781,7 @@ gtk_action_group_add_actions_full (GtkActionGroup       *action_group,
 
       if (entries[i].stock_id) 
        {
-         GtkStockItem item;
-
-         if (gtk_stock_lookup (entries[i].stock_id, &item))
+         if (gtk_icon_factory_lookup_default (entries[i].stock_id))
            g_object_set (action, "stock-id", entries[i].stock_id, NULL);
          else
            g_object_set (action, "icon-name", entries[i].stock_id, NULL);
@@ -889,7 +887,7 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup             *action_gro
        {
          GtkStockItem item;
 
-         if (gtk_stock_lookup (entries[i].stock_id, &item))
+         if (gtk_icon_factory_lookup_default (entries[i].stock_id))
            g_object_set (action, "stock-id", entries[i].stock_id, NULL);
          else
            g_object_set (action, "icon-name", entries[i].stock_id, NULL);
@@ -1004,7 +1002,7 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup            *action_group
        {
          GtkStockItem item;
 
-         if (gtk_stock_lookup (entries[i].stock_id, &item))
+         if (gtk_icon_factory_lookup_default (entries[i].stock_id))
            g_object_set (action, "stock-id", entries[i].stock_id, NULL);
          else
            g_object_set (action, "icon-name", entries[i].stock_id, NULL);